Stop cherry-picking, start merging, Part 1: The merge conflict March 12, 2018 Mar 12, 2018 03/12/18 Raymond Chen Setting the pieces into motion.